bitkeeper revision 1.1236.1.54 (42277de2WK7_Nt8AUEblj6keTcJhBw)

Fix short int defines to match other fixes to tools tree.

Signed-off-by: andrew.warfield@cl.cam.ac.uk

diff --git a/tools/blktap/blockstore.h b/tools/blktap/blockstore.h
index 3ccd7ab65d33dce45c91a48454bcdd9adcf4ccd2..0e531c5ab420c17ef3ae477ccc037c8b7085422b 100644 (file)
--- a/tools/blktap/blockstore.h
+++ b/tools/blktap/blockstore.h
@@ -9,21 +9,7 @@
 #ifndef __BLOCKSTORE_H__
 #define __BLOCKSTORE_H__
 
-#ifndef __SHORT_INT_TYPES__
-#define __SHORT_INT_TYPES__
-
-#include <stdint.h>
-
-typedef uint8_t            u8;
-typedef uint16_t           u16;
-typedef uint32_t           u32;
-typedef uint64_t           u64;
-typedef int8_t             s8;
-typedef int16_t            s16;
-typedef int32_t            s32;
-typedef int64_t            s64;
-                           
-#endif /*  __SHORT_INT_TYPES__ */
+#include <xc.h>
 
 #define BLOCK_SIZE  4096
 #define BLOCK_SHIFT   12